Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 9 Jul 2011 18:31:04 +0000 (11:31 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 9 Jul 2011 18:31:04 +0000 (11:31 -0700)
commit97d73f6dee8ef33921b896d24fcc4b87be2072b3
tree9dd52fd7513b21d081817355b87838ce75553864
parent8fb0267c6d7d6afe9005df06192f8b931b917fce
parent743d1e7d39f874343963011fd06ee1be127727d4
Merge from trunk.